Check (tri-)state usage of zlib and use the right header file.

git-svn-id: http://gpsbabel.googlecode.com/svn/trunk@2292 f51c46e8-681c-474f-0cfe-069cfd0219fb

diff --git a/gpsbabel/defs.h b/gpsbabel/defs.h
index 736e21d143f569842191e5847402435ffa68a286..7b0d04c1baa407690fe3bbda668a9dc24d68b19b 100644 (file)
--- a/gpsbabel/defs.h
+++ b/gpsbabel/defs.h
@@ -28,7 +28,11 @@
 #include "config.h"
 #include "queue.h"
 #include "gbtypes.h"
+#if HAVE_LIBZ
+#include <zlib.h>
+#elif !ZLIB_INHIBITED
 #include "zlib/zlib.h"
+#endif
 #include "gbfile.h"
 #include "cet.h"
 #include "cet_util.h"